Emit ::changed when removing the active row. (#452056, Paul Pogonyshev)

2007-07-09  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted): Emit
        ::changed when removing the active row.  (#452056, Paul Pogonyshev)

svn path=/trunk/; revision=18416

diff --git a/ChangeLog b/ChangeLog
index b2c4907fea7851d08ca77b052078f47973dbf1a9..f4cb0de2a41c2d01611ee222b7d9efe0291b0406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted): Emit 
+       ::changed when removing the active row.  (#452056, Paul Pogonyshev)
+
 2007-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksearchenginesimple.c: Address some thread-safety

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 424d73323b0d9715d124fcf3d8a6288db685b6a3..234c9b7b0861d0779e813d6bf2e1f5ffdc73c7a0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3077,10 +3077,11 @@ gtk_combo_box_model_row_deleted (GtkTreeModel     *model,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
 
-  if (combo_box->priv->cell_view)
+  if (!gtk_tree_row_reference_valid (combo_box->priv->active_row))
     {
-      if (!gtk_tree_row_reference_valid (combo_box->priv->active_row))
+      if (combo_box->priv->cell_view)
        gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL);
+      g_signal_emit (combo_box, combo_box_signals[CHANGED], 0);
     }
   
   if (combo_box->priv->tree_view)